From: Luka Perkov <luka@openwrt.org>
Date: Thu, 30 Oct 2014 10:24:35 +0000 (-0400)
Subject: lxc: move patch
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org/%22http:/www.crowdsec.net//%22https%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22https%22?a=commitdiff_plain;h=f0cf42ca7eff1f770f87ec9f2d4aa73b428c6329;p=feed%2Fpackages.git

lxc: move patch

Signed-off-by: Luka Perkov <luka@openwrt.org>
---

diff --git a/utils/lxc/patches/025-remove-unsupported-option.patch b/utils/lxc/patches/025-remove-unsupported-option.patch
new file mode 100644
index 0000000000..f70d49d951
--- /dev/null
+++ b/utils/lxc/patches/025-remove-unsupported-option.patch
@@ -0,0 +1,19 @@
+--- a/templates/lxc-download.in
++++ b/templates/lxc-download.in
+@@ -479,15 +479,7 @@ fi
+ # Unpack the rootfs
+ echo "Unpacking the rootfs"
+ 
+-EXCLUDES=""
+-excludelist=$(relevant_file excludes)
+-if [ -f "${excludelist}" ]; then
+-    while read line; do
+-        EXCLUDES="$EXCLUDES --exclude=$line"
+-    done < $excludelist
+-fi
+-
+-tar  --anchored ${EXCLUDES} --numeric-owner -xpJf \
++tar --numeric-owner -xpJf \
+     ${LXC_CACHE_PATH}/rootfs.tar.xz -C ${LXC_ROOTFS}
+ 
+ mkdir -p ${LXC_ROOTFS}/dev/pts/
diff --git a/utils/lxc/patches/201-remove-unsupported-option.patch b/utils/lxc/patches/201-remove-unsupported-option.patch
deleted file mode 100644
index f70d49d951..0000000000
--- a/utils/lxc/patches/201-remove-unsupported-option.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/templates/lxc-download.in
-+++ b/templates/lxc-download.in
-@@ -479,15 +479,7 @@ fi
- # Unpack the rootfs
- echo "Unpacking the rootfs"
- 
--EXCLUDES=""
--excludelist=$(relevant_file excludes)
--if [ -f "${excludelist}" ]; then
--    while read line; do
--        EXCLUDES="$EXCLUDES --exclude=$line"
--    done < $excludelist
--fi
--
--tar  --anchored ${EXCLUDES} --numeric-owner -xpJf \
-+tar --numeric-owner -xpJf \
-     ${LXC_CACHE_PATH}/rootfs.tar.xz -C ${LXC_ROOTFS}
- 
- mkdir -p ${LXC_ROOTFS}/dev/pts/